Fixed compiler abort on certain LDFLAGS values (-Wl,-z,defs) by

applying patch from christopher taylor, closing bug #462536.
* babl/Makefile.am:
* extensions/Makefile.am:

svn path=/trunk/; revision=234

diff --git a/ChangeLog b/ChangeLog
index d3671a9d0a77a4017a4de79bf647dfa690edb6f3..5e56f3dcb3994c1704df1c4f2f9e164b0138163c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-01  Øyvind Kolås  <pippin@gimp.org>
+
+       Fixed compiler abort on certain LDFLAGS values (-Wl,-z,defs) by
+       applying patch from christopher taylor, closing bug #462536.
+
+       * babl/Makefile.am:
+       * extensions/Makefile.am:
+
 2007-03-21  Øyvind Kolås  <pippin@gimp.org>
 
        Reindented all of the code using uncrustify.

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 53de1d9b33d80b09f22f8f9053e695149d7639ba..9306592432678bea922242ae8f840f5acda35aa1 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -53,6 +53,6 @@ libbabl_@BABL_API_VERSION@_la_LIBADD=\
        base/libbase.la \
        @LTLIBOBJS@
 
-libbabl_@BABL_API_VERSION@_la_LDFLAGS= \
-       ${no_undefined}                \
+libbabl_@BABL_API_VERSION@_la_LDFLAGS=                 \
+       ${no_undefined} -ldl $(MATH_LIB)        \
        -version-info $(BABL_LIBRARY_VERSION)

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f8d3a5d75a2a6d16e9bd7340dcbd9e91f7c72480..671c6ca3d7d7614bf60ddcc0bba28fff165ef1d0 100644 (file)
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -17,7 +17,11 @@ CFLAGS  += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC
 
 LDFLAGS += -shared
 
-LDADD    = $(no-undefined) $(libbabldlla)
+if OS_WIN32
+LDADD    = $(no-undefined) $(libbabldlla) $(MATH_LIB)
+else
+LDADD    = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION).so $(MATH_LIB)
+endif
 
 %$(SHREXT): %.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
@@ -28,7 +32,7 @@ LDADD    = $(no-undefined) $(libbabldlla)
 #      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
 CIE-Lab$(SHREXT): CIE-Lab.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(MATH_LIB)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 #lcms$(SHREXT): lcms.c
 #      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################